Merge pull request #21 from CryptoManiac/master

Recent updates
Merge branch 'master' of github.com:novacoin-project/novacoin
Merge branch 'master' of github.com:novacoin-project/novacoin
Merge branch 'master' of github.com:novacoin-project/novacoin
Fix makefiles syntax