formatting all the way
Merge branch 'master' into refactoring

Conflicts:
	src/config-manager.vala
	src/main.vala
	src/neo-window.vala
	src/unique.vala
Update .gitignore