Updates 2/21/14

Just updated files and added Daux.io to the server
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore