Fixes for #221, #222 and #223
#223 - Fixing by using Robert Hooke library to override lein ring war behavior. Now call the lein aws target to build war for Amazon
Merge branch 'master' of git://github.com/butlermh/snowplow into butlermh-master
Merge branch 'butlermh-master' into feature/clj-collector-upgrade

Conflicts:
	2-collectors/clojure-collector/project.clj