Chaned the position of the 'edit' and 'search the web' links.  Also changed the cust.css.scss style sheet to give the 'edit' link more margin.
Stashing for a peek at another branch.
Putting things away for the vacation week.
Working release of location update feature with a modal pop-up.
Updating notes.
Removed the test modal button on the cellar page and added notes about how the change location works.
Generated Globals
Changed the script that generates the version output
Added httpd conf files and html files to signal an outage.  Updated the AWS notes for usage.
generated globals
Updated AWS notes
Updated Apache notes
Merge branch 'master' into 20131007_responsiveBootstrap_feature

Conflicts:
	app/assets/stylesheets/custom.css.scss
	notes/AWS Notes