Include installation instructions in README.md
Update README.md
Update README.md
Update README.md
Merge pull request #147 from Orasi/travis-ci-setup

Travis ci setup
Update README.md
Merge pull request #148 from Orasi/travis-ci-setup

Update to travis.yml.
Add function to send email when user cancels vacation request
Merge pull request #149 from Orasi/staging-two

Add function to send email when user cancels vacation request
Issue with some versions of ruby.
Merge pull request #150 from Orasi/travis-ci-setup

Travis ci setup
Should fix issue with view template glitching.
Merge pull request #151 from Orasi/angular-js-view-cleanup

Should fix issue with view template glitching.
Add functionality to allow admin to query AD for employee username
Fix admin AD check functionality
Changed flash to error
Merge branch 'staging' into staging-two

Conflicts:
	app/assets/stylesheets/application.css.erb.scss
Merge pull request #152 from Orasi/staging-two

Add functionality to allow admin to query AD for employee username
Added some more tests for simplecov integration.  Looking to hit at least 90%.
Adding coveralls.