Cleaned up a hige amount of CSS and JS, got rid of push state

Much refactor, such clean
Merge remote-tracking branch 'origin/master' into es-clean-up-js-css
Merge pull request #19 from sea-lions-2014/es-clean-up-js-css

Cleaned up a hige amount of CSS and JS, got rid of push state
fixes merge conflict with master
Adds additional styling, delete route still needs bug fix