Delete .classpath
Delete .project
Delete org.eclipse.jdt.core.prefs
Delete org.eclipse.m2e.core.prefs
Delete LICENSE
Update .gitignore
WTF is git doing?  I think this is the development merge I've been
trying to get to work for the last 30 mins...
Merge branch 'master' into development