Misc. changes
Wercker config for CI
Clean up