Changed some of the code to conform to JS Hint
Added style.css to gitignore
Merge branch 'staging' of http://github.com/scrollback/scrollback into staging

Conflicts:
	public/sdk/controller.js