Reformatted code; Removed maven-ant-run plugin
Modified .gitignore
Fixed tests