version bump
Merge branch 'release/v1.0.4'

Conflicts:
	lib/nixonpi/version.rb
Merge branch 'release/v1.0.5'
add asset packing to sinatra web app
update gemspeck and web server for asset pack support
update layout and move web files into app folder