Separated parallel browser tests into serial, added waits to tests
Added PHP version to Sauce build name
Changed travis file, added sanity test
Removed sudo from travis serve
add generate short url button and api call.  Resolves #396
add commenting
comment out calls to protractor until we can get those running
tweak travis config
Merge pull request #459 from opengovfoundation/issue396

Issue396
remove scrutinizer build status
attempt to set up apache vhost on travis for sauce connect
travis vhost switch to port 8000
remove bower install command from install.  All js is now bundled in app.js
curl madison to ensure it's running on travis'
tweak host for travis vhost
remove curl call
tweak protractor host to match travis setup
add testing app.js
do not run protractor tests
Merge branch 'master' into angular-tour

Conflicts:
	public/build/app.js
	public/build/app.map