More upgrades + bug fixes:

- Upgrade to latest Rails
- Upgrade assets for latest rails
- Fix twitter bootstrap dependency after asset upgrades
- Fix ERB syntax in application layout
- Remove requirement of less (not even used)
revert syntax on application layout
Merge branch 'feature/upgrades'

Conflicts:
	[RESOLVED] Gemfile
	[RESOLVED] Gemfile.lock
Merge pull request #3 from dchapman1988/master

Merge and fix conflicts