Merge pull request #4 from crabstic/dev

A weekends work...
Merge branch 'dev'
Precompiled assets locally
Merge branch 'dev'
Trying to fix assets on heroku.
Trying to fix assets on heroku.
Merge branch 'master' of github.com:crabstic/Linnaeus
Heroku assets problems.
Merge branch 'master' of github.com:crabstic/Linnaeus

Conflicts:
	public/assets/manifest-d2cbe2768aff1f5cb5d34ea22c7200b3.json
Remove compiled assets
Merge branch 'master' of heroku.com:linnaeus
Heroku assets...
Heroku assets...
Merge branch 'master' of github.com:crabstic/Linnaeus

Conflicts:
	Gemfile
Yeti
Merge branch 'master' of github.com:crabstic/Linnaeus
Precompile yeti
Merge branch 'master' of github.com:crabstic/Linnaeus