diff --git a/.vagrant.v1.1380248914 b/.vagrant.v1.1380248914 deleted file mode 100644 index d280fe710..000000000 --- a/.vagrant.v1.1380248914 +++ /dev/null @@ -1 +0,0 @@ -{"active":{"default":"d4f35030-4dba-4dbb-9110-ad346b2bbeb7"}} \ No newline at end of file diff --git a/README.markdown b/README.markdown index 2f154596f..a3c0b3b7a 100644 --- a/README.markdown +++ b/README.markdown @@ -1,6 +1,6 @@ # Slim Framework -[![Build Status](https://secure.travis-ci.org/codeguy/Slim.png)](http://travis-ci.org/codeguy/Slim) +[![Build Status](https://secure.travis-ci.org/codeguy/Slim.png?branch=master)](http://travis-ci.org/codeguy/Slim) Slim is a PHP micro framework that helps you quickly write simple yet powerful web applications and APIs. Slim is easy to use for both beginners and professionals. Slim favors cleanliness over terseness and common cases @@ -163,7 +163,7 @@ Follow [@slimphp](http://www.twitter.com/slimphp) on Twitter to receive news and ## Author -The Slim Framework is created and maintained by [Josh Lockhart](https://www.joshlockhart.com). Josh is a senior +The Slim Framework is created and maintained by [Josh Lockhart](http://www.joshlockhart.com). Josh is a senior web developer at [New Media Campaigns](http://www.newmediacampaigns.com/). Josh also created and maintains [PHP: The Right Way](http://www.phptherightway.com/), a popular movement in the PHP community to introduce new PHP programmers to best practices and good information.